Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses / src / common / AccountInterface.java

package common;

import java.rmi.Remote;
import java.rmi.RemoteException;
import domain.Account;

public interface AccountInterface extends Remote{
        

        public boolean addAccount(Account ac) throws RemoteException;
        
        public boolean removeAccount(Account ac) throws RemoteException;
}