Remove unnecessary file publisher.cc.rej was a merge conflict resolution file created by git which accidentally got committed. Removing... Change-Id: I090b0ef8f596d009bf61488266f9b3a8e7c3d6d0