Removed Alternate and added idea thread
Dealing with merge conflicts