priyanka-footer intigrated
priyanka-conflict resolved