GUI input completed
merge from server and resolved conflicts