Merging remote and local, updating edit and styling around create thread