adding whitespace to improve post merge readability, comments.

removing file included in two branches

adding missed template