Unresolved merge comflicts resolved

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>