find-architects view redone
resolving conflict
login registartion
resolving conflict