Changed projct properties..

Signed-off-by: JW-Vinay<vinay.ramkrishnan@gmail.com>
removed conflicts