Done feature posts
resolve conflict